From: Axel Neumann <neumann@cgws.de>
Date: Thu, 30 Jan 2014 04:47:01 +0000 (+0100)
Subject: Merge branch 'master' into bmx6_testing
X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22/%22https:/collectd.org/%22?a=commitdiff_plain;h=9666bb6860e35cefd66d0b917ecf294f09f83a1c;p=feed%2Frouting.git

Merge branch 'master' into bmx6_testing
---

9666bb6860e35cefd66d0b917ecf294f09f83a1c